Backport 11.x

Closes #3555115

Merge request reports

Loading