- Merge remote-tracking branch 'remotes/origin/main' into 2238-fix-basop-main-in-msvc-release