Fix code quality issues.

Closes #3542842

Merge request reports

Loading