Merge branch 'subdirs-simplify' into maint