[sprint 42 resolved issue SAT-594,SAT-595]

[sprint 42 resolved issue SAT-594,SAT-595]