Signed-off-by: Bryan Beaudreault <bbeaudreault@apache.org> Reviewed-by: SiCheng-Zheng <643463623@qq.com> (cherry picked from commit b1691a53185efcafc1d2a15767a88825f4d7b625)