Merge branch 'js/rebase-merge-octopus'