Rebase futility tweak against master