Issue #3223801: Fix coding standards

Alexander Delfim requested to merge issue/hacked-3223801:3223801-fix-coding-standards into 8.x-2.x Oct 07, 2022