Merge "Handle archival for all users." into main