Merge branch 'main' into 823-cmake-build-fails-with-dinclude_split-1