[sprint-35 resolved issues SAT-429, SAT-430, SAT-431, SAT-432, SAT-435, SAT-436, SAT-438 , SAT-439]