[changes for the issue SAT-1256 for]