Merge "Fix Javadoc." into jb-dev