Merge "Refactored YANG types resolving."