Merge "Integration test for metrics + bug fix"

No match.