Rebase compatibility pull requests