Merge branch 'dt/merge-recursive-case-insensitive' into maint