Merge "enforce limit on SubscriptionAddress" into udc-dev