successfull  cherry-pick for  9ab33ef08379aebc12d34f2da6eda3726d7bcfe5