Merge "Yang resource name persistence"