BP-825, BP-824, BP-832 fix bugs
16 files changed