3a355282c9
Reviewed-by: He Xiaoqiao <hexiaoqiao@apache.org> (cherry picked from commit f5f3fc6fe90e3bb2ee783f956432db11e655b9e3)