Update cherry-pick script