Added support for cherry-picking into alt branches