Fix the cherry-pick commit which potential i missed in merge conflicts