Merged archive fixes to v1.65 main.