SOS-1401

Please backport to 6.1.20