Add new cherry-picks