SOS-1403 SOS-1403 forward port to 6.2
SOS-1403 Regen