Merged fixes back to v1.60 from archiving