Backport fix from 2.1.x

Closes #3425134

Merge request reports

Loading