Merge branch 'jm/dedup-test-config' into maint