Merge Metrics Branch

Resolves #3