Preparing code for incoming rebase