Merge branch 'js/misc-doc-fixes'