Draft: Resolve #3580500 "Coding standard fixes"

Closes #3580500

Merge request reports

Loading