[sprint-32 resolved issues SAT-370, SAT-371 , SAT-373]