Merge pull request 'metrics' (#375) from stats into develop