Merge branch 'js-update'