[sprint-40 resolved issues SAT-559, SAT-566, SAT-463 , SAT-564, SAT-565, SAT-567]