manual fixes for cherry-picks
manual fixes for cherry-picks