[remaining changes of the issue SAT-1384]