Merge branch 'use-notify-existing-metric'