SOS-1351

Please backport this to 6.1.20