Issue #3274741: Fix coding standards

Vadym Abramchuk requested to merge issue/machine_name-3274741:3274741-fix-coding-standards into 8.x-1.x Apr 12, 2022