Merge branch 'stats-collector-logging'