SOS-1423

Please backport to 6.1.20