Reviewed-by: Tsz-Wo Nicholas Sze <szetszwo@apache.org> (cherry picked from commit 9d47108b50fb0cd79ca48e82077e57572d8873e6)