Reviewed-by: He Xiaoqiao <hexiaoqiao@apache.org> (cherry picked from commit 5dd859a8a0d038ff04acbb96741a215d6a0e8c29)