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