Cherrypicks

A few cherry-picks