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