[resolved issues SAT-280, SAT-290, SAT-315, SAT-313 ]
[resolved issues SAT-280, SAT-290, SAT-315, SAT-313 ]