SOS-1412

Please backport to 6.1.20