Created by: heavengate

cherry-pick https://github.com/PaddlePaddle/Paddle/pull/21227 and https://github.com/PaddlePaddle/Paddle/pull/21247 to release/1.6