Co-authored-by: Zhenzhao Wang <zhenzhaowang@gmail.com> (cherry picked from commit 12a316cdf9994feaa36c3ff7d13e67d70398a9f3)