Prepare for rebase from original master