Issue #3372890: Fix coding standards

Maxime Roux requested to merge issue/index_now-3372890:3372890-fix-coding-standards into 1.0.x Jul 06, 2023