Merge "Fix exception in getting capabilities" into udc-dev