[sprint-31 resolved issues modification in SAT-358, SAT-375, SAT-374, SAT-372, SAT-366, SAT-368]