[sprint-35 resolved issues SAT-422,SAT-423,SAT-428]
[sprint-35 resolved issues SAT-422,SAT-423,SAT-428]