[resolved issues SAT-316, SAT-316, SAT-317, SAT-319, SAT-320, SAT-322, SAT-327, SAT-328 , SAT-318, SAT-338, SAT-344, SAT-345, SAT-346]