[sprint-37 resolved issues SAT-461, SAT-462, SAT-470 , SAT-479, SAT-480, SAT-481, SAT-483]