Getting changes from main branch

(No idea how this works… hopefully nothing breaks.)