Merge branch 'js/t3404-typofix'