Issue #3259607: Fix coding standards

Beatriz Varela requested to merge issue/twitter_username-3259607:3259607-fix-coding-standards into 8.x-1.x Mar 15, 2022