Update to Metrics R7.
Merge remote-tracking branch 'origin/master'