Updates cherry-picks for tht