9c0d6e1657
Signed-off-by: Wei-Chiu Chuang <weichiu@apache.org> (cherry picked from commit 7bebad61d9c3dbff81fdcf243585fd3e9ae59dde)