Merge remote-tracking branch 'stats-collector/master' into community/master