Upgrade to Metrics 3 final.
Merge remote-tracking branch 'upstream/master'