Signed-off-by: Wei-Chiu Chuang <weichiu@apache.org> (cherry picked from commit c528e427aa6745434672b1c1850738795ad1d6d2) (cherry picked from commit 388f445dde577999b2d81f809adcfca8f0958499) (cherry picked from commit d9899015ebf8a27e9ac339d8a8b3c9d88bcbacb9)