Merge branch 'js/pull-rebase'