reapply modifications as per patch

Closes #3158196

Merge request reports

Loading