SOS-1463

6.2.x commit