Coding standard related issue fixes

Vishal Jangidrequested to merge
issue/dtuber-3347622:coding_standard into 2.0.x

Merge request reports