archiving-related fixes
delete support
manual merge