SOS-1204

Please backport to 6.1.20.