SOS-1663

6.2.x forward port