Add rebase=1 for upstream extensions