e14d00469a
Reviewed-by: Hui Fei <ferhui@apache.org> (cherry picked from commit 8a489ce78e05cffc2de8923dc5ac7361a72250a8)