Merge branch 'js/merge'