[sprint-30 resolved issues SAT-354, SAT-334, SAT-357, SAT-359]