cherry-pick fix-1