Changes from code inspection
Merge remote-tracking branch 'origin/master'