Merge "docs: clean up javadoc code snippets, unescaped entities" into jb-dev