Created by: jerrywgz

cherry-pick https://github.com/PaddlePaddle/PaddleDetection/pull/430 and https://github.com/PaddlePaddle/PaddleDetection/pull/498