fix cherry-pick error from 3.4.46 update