Merge "Fix failing tests related to archiving" into main