Merge "CDM Transport clean-up" into udc-dev