Merge branch 'js/patch'