Merge branch 'js/t0007-typofix'