[changes for the issue SAT-1256 for]
changes regarding SAT-1252