Merge branches 'subdirs-simplify' and 'subdir-objects-pr10697' into maint