[sprint-35 resolved issues SAT-78, SAT-394]