QA: Coding standards adjustments
Release 6.0.2