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