SOS-1376

Please backport to 6.1.20. This fix contains regenerate.