Fixes for coding rules violations
Merge remote-tracking branch 'origin/master'