Merge branch 'js/rebase-am-options-fix'