cherry-pick fixes