SOS-1369

Please backport to 6.1.20