Merge "Fix javadoc" into jb-dev