Issue #3339621: Fix coding standards

Patrick Kenny requested to merge issue/tome-3339621:coding_standards into 8.x-1.x Feb 06, 2023