Merge "Minor Javadoc improvements" into udc-dev