Merge branch 'main' into...

Merge branch 'main' into 264-change-cmakelists-txt-to-closer-match-visualstudio-dependency-structure