[sprint-40 resolved issues SAT-550, SAT-551, SAT-552, SAT-553, SAT-554, SAT-557]