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