SOS-1339

Please backport to 6.1.20