SOS-1344

Please backport to 6.1.20