Merge "Be resilient to restoring unintelligible network templates"