Signed-off-by: Guanghao Zhang <zghao@apache.org> (cherry picked from commit 3f17745f6e66c977d0dea16ac98cd4368a207944)