Merge branch 'metrics' into 'develop'

Move record method to outside of the class. Add render_as_batch=True to...

See merge request !79
3 jobs for develop in 1 minute and 16 seconds (queued for 2 seconds)