SOS-1478

6.2.x forward port for SOS-1478