Add some more cherry-picks