[resolved issues SAT-275, SAT-280, SAT-278, SAT-279, SAT-281, SAT-283]