Merge fallback-metric changes into latest master.
Merge branch 'fallback-metric'