Merge from main (doing this on a branch as there were some tricky conflicts, will likely need manual fixes)