Merge "Fix documentation" into udc-dev