Merge "fix misc doc bugs from external issues" into jb-dev