Signed-off-by: Wei-Chiu Chuang <weichiu@apache.org> (cherry picked from commit 99af49878cc47f5750b6c0edadc8a4c2fcd7a7c6) (cherry picked from commit 8ba4e13dcc4ad16e8483d33a31ed52e1b8d4e686) (cherry picked from commit 974706c5fdd7c875922b38a2efffb6b7bda8cdf5)