Modernise code

Closes #3612460

Merge request reports

Loading