Merge "Prevent (and repair) poisoned full-data backup queue"