cherry-picks for 2.066.1