Merge remote-tracking branch 'mainline/master'; Add some comments and formatting