Merge "Fix crash that happens if you call archive twice." into main