- More consts, and comments
Merge remote-tracking branch 'upstream/master'