Reviewed-by: Xiaoyu Yao <xyao@apache.org> (cherry picked from commit 9664b9c7a65d943e815c119e94234d3bf0b68dd4) (cherry picked from commit bd2f79cfd8da9279acca826a86ea7bfcc8590bd1)
Reviewed-by: Xiaoyu Yao <xyao@apache.org> (cherry picked from commit 9664b9c7a65d943e815c119e94234d3bf0b68dd4) (cherry picked from commit bd2f79cfd8da9279acca826a86ea7bfcc8590bd1)