fix: #3266313 Fix coding standards issues

Liam Morlandrequested to merge
issue/field_tokens-3266313:3266313-coding-standards into 2.0.x

Closes #3266313

Merge request reports