Merge "Fix improper patch rebase"