Copy over #3510599

Closes #3569832

Merge request reports

Loading