Less work arounds

Closes #3610138

Merge request reports

Loading