SOS-1418

Please backport to 6.1.20