Merge "[DO NOT MERGE] Compatibilize with git_master" into udc-dev