improved backup behavior for factory-reset