Merge "Fix documentation" into jb-dev