(cherry picked from commit 6b331dde31cec2676a93406c9ecf699fc0675c8c)
Signed-off-by: Wei-Chiu Chuang <weichiu@apache.org> (cherry picked from commit 697e5d463640a7107a622262eb2d333d0458fd8b)