Merge "Fix delegates access to API with permission checks." into udc-dev