Backport #23015 --------- Co-authored-by: Jason Song <i@wolfogre.com> (cherry picked from commit 7b3ffe5745)
7b3ffe5745