SOS-1497

Please backport to 6.1.x and 6.1.20