SOS-1684

Please backport to 6.1.x CE