Backport to 11.x

Closes #3587806

Merge request reports

Loading