Issue #3384916: Fix Coding Standards

Naveen Valecha requested to merge issue/convivial_content-3384916:3384916-fix-coding-standards into 1.0.x Sep 02, 2023