Merge "Mention that ErrorState and StatusCode must match" into udc-dev