SOS-1377

Please backport to 6.1.20