Signed-off-by: Wei-Chiu Chuang <weichiu@apache.org> (cherry picked from commit a87e458432609b7a35a2abd6410b02e8a2ffc974) (cherry picked from commit ae8839e6e8cc3e8f8d5e50525d3302038ada484b) (cherry picked from commit 704330a616c17256b3e39370f999928ba1c463e6)