SOS-1408

Please backport to 6.1.x