Coding standard fixes

Closes #2833680

Merge request reports

Loading