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