Merge "Fix minor issues in documentation" into udc-dev