Signed-off-by: Xiaolin Ha <haxiaolin@apache.org> (cherry picked from commit 5ad51e8b2b4b78bc7f92eea04465e24a7577d3ad)