Merge "Change id type to string and extract control enum" into udc-dev