SOS-1223

please backport to 6.1.20