FC-2739 refactored media archiving and rollback