[sprint-31 resolved issues modification in SAT-366, SAT-368, SAT-367, SAT-369]

[sprint-31 resolved issues modification in SAT-366, SAT-368, SAT-367, SAT-369]