Merge branch 'main' into 2035-makefile-remove-dependencies-on-include_split