Add a bunch of cherry-picks