Merge branch 'main' into soph/loosen-repo-list-enums