Merge branch 'jk/config-cleanup' into maint-2.43