[sprint-35 resolved issues SAT-422 modification]