Backport of updates from 3.x

Closes #3451117

Merge request reports

Loading