Merge remote-tracking branch 'github/master' into lh/performance