Merge "Fix a concurrent modification exception when generating stubs" into udc-dev