Update with current cherry-picks