Issue #3274317: Fix coding standards

Joshua Fernandes requested to merge issue/contribute-3274317:3274317-fix-coding-standards into 8.x-1.x Apr 08, 2022