Backport to 11.x

Closes #3572173

Merge request reports

Loading