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