SOS-1422

Please backport to 6.1.20