Merge branch 'rr/tests-dedup-test-config' into maint