Various cherry-pick updates