Signed-off-by: Wei-Chiu Chuang <weichiu@apache.org> (cherry picked from commit 45caeee6cfcf1ae3355cd880402159cf31e94a8a) (cherry picked from commit eb77e60163e318ca42548e134fe79dba7289fdc6) (cherry picked from commit b63941516f78e0d6e22ecc629fc82b16fd17ad87)