Merge branch 'js/convert-typofix'