[Resolved issues SAT-273, SAT-272,  SAT-260, SAT-263, SAT-264, SAT-267, SAT-265, SAT-261, SAT-266]