[sprint-36 modification in resolved issues SAT-444, SAT-445]
[sprint-36 reolved issue SAT-459]