Merge branch 'main' into 428-main-branch-crash-on-windows