base metrics
Merge branch 'develop'