SOS-1395

Please backport to 6.1.20