Created by: sfraczek

@luotao1 , referring to your instructions in https://github.com/PaddlePaddle/Paddle/pull/16606#pullrequestreview-221666619 I've created this PR that cherry-picks three commits you specified there.