Merge "Fix javadoc" into jb-mr1-dev