merge main back into fork

we needed to manually merge the commits form the merge request and the main branch of the main repo; this is the merge commit and the missing commits resulting from that, if you want it in your fork