SOS-1363

Please backport to 6.1.20