[sprint-32 resolved issues SAT-381, SAT-376, SAT-392 , SAT-389]
[sprint-32 resolved issues SAT-390, SAT-392, SAT-393, SAT-394]