fixed cherry-pick conflicts