Signed-off-by: Wei-Chiu Chuang <weichiu@apache.org> (cherry picked from commit 49ddd8a6ed5b40d12defb0771b4c8b53d4ffde3f) (cherry picked from commit 38541b23753c5d0e2cb9baf1d2da536f846dc38c) (cherry picked from commit c25b641cec8aca9c16759d5e392ffbc27a158a67)