Signed-off-by: Wei-Chiu Chuang <weichiu@apache.org> (cherry picked from commit 800b1ed1c22ccd60a8560a80e2d84129b359e630)