Merge branch 'ph/builtin-srcs-are-in-subdir-these-days' into maint