Merge "Better handling of backup/restore operations."