84726679f0
Signed-off-by: Wei-Chiu Chuang <weichiu@apache.org> (cherry picked from commit e2cecb681e2aab8b7c5465719cac53dce407a64c) (cherry picked from commit a7dd244a4995cbf20feb054530fc5913ccf384ac)