SOS-1261

Please backport to 6.1.20