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