SOS-1666

Please backport to 6.1.x CE