sprint-37 resolved issues SAT-468, SAT-469, SAT-471, SAT-472, SAT-474, SAT-478

sprint-37 resolved issues SAT-468, SAT-469, SAT-471, SAT-472, SAT-474, SAT-478