[sprint 46 resolved issues SAT-790, SAT-833, SAT-840]
[sprint