changes regarding issue SAT-1256
[chnages for issue SAT-1256 19_nov]