4f600c32d4
(cherry picked from commit d79f42351fd3d61d180a224d4b8fb51184eb347e) Close #3625
(cherry picked from commit d79f42351fd3d61d180a224d4b8fb51184eb347e) Close #3625