Improved code quality

Closes #3558970

Merge request reports

Loading