Merge branch 'main' into 258-revise-visual-studio-release-build-configuration