Issue #3249837: Fix coding standards

Sven Schüring requested to merge issue/etracker-3249837:3249837-fix-coding-standards into 8.x-3.x Aug 03, 2022