Apply changes from MR312.

Closes #3494493

Merge request reports

Loading