[resolved issue SAT-274, SAT-282, SAT-296, SAT-297, SAT-298, SAT-277, SAT-290 , SAT-275, SAT-280, SAT-278, SAT-279, SAT-281, SAT-283]