Merge branch 'main' into ms/bug-fixes