add new cherry-picks