Updated cherry-picks