Fix coding standard issues

Closes #3582123

Merge request reports

Loading