Merge "Use correct backup mode for k/v restore" into udc-dev