Merge branch 'jm/dedup-name-compare'