Merge branch 'js/rebase-helper'