Merge branch 'main' into 633-many-files-in-the-repo-seem-to-have-the-wrong-copyright-header