Merge branch 'jk/config-ignore-duplicates' into next