sprint-32 resolved issues [SAT-377, SAT-378, SAT-379 ]

sprint-32 resolved issues [SAT-377, SAT-378, SAT-379 ]