Merge branch 'main' into invalid-name-type-annotation