fixed merge from 0.10 cherry pick
fixed cherry pick