Created by: typhoonzero
Resolve https://github.com/PaddlePaddle/Paddle/issues/8523
Fix https://github.com/PaddlePaddle/Paddle/issues/9019
