Backport to 11.3.x

Closes #3541910

Merge request reports

Loading