Merge branch 'js/rebase-am'