Initial attempt at modernization.

Closes #3610046

Merge request reports

Loading