[sprint-40 resolved issues SAT-561, SAT-562, SAT-463]