[sprint-39 resolved issues SAT-539, SAT-540, SAT-541, SAT-544, SAT-543, SAT-544 , SAT-545]