Added the cherry-pick function