Merge "[DO NOT MERGE] Compatibilize UDC dev to master" into udc-dev