[sprint 47 resolved issues SAT-901, SAT-902, SAT-903, SAT-906]

[sprint 47 resolved issues SAT-901, SAT-902, SAT-903, SAT-906]