[sprint 47 resolved issues SAT-904, SAT-905, SAT-907, SAT-908]