Merge branch '2023-09-30-assorted-build-related-changes' into next

- Assorted build cleanups / changes