[sprint-40 resolved issues SAT-556, SAT-557, SAT-558, SAT-560]