sprint-30 resolved issues [SAT-319,SAT-340, SAT-346, SAT-347]

sprint-30 resolved issues [SAT-319,SAT-340, SAT-346, SAT-347]