sprint-37 resolved issues SAT-489, SAT-491, SAT-492

sprint-37 resolved issues SAT-489, SAT-491, SAT-492