Merge branch '2022-12-12-build-related-updates' into next