Port patch to MR

This reverts commit ca82a9df.

Closes #3131508

Merge request reports

Loading