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