sprint-40 resolved issues [SAT-546,SAT-547, SAT-548, SAT-549]

sprint-40 resolved issues [SAT-546,SAT-547, SAT-548, SAT-549]