Code style fixes
Merge remote-tracking branch 'base/master'