Merge branch 'js/fix-merge-arg-quoting-in-rebase-p'