Co-authored-by: wxiaoguang <wxiaoguang@gmail.com> (cherry picked from commit aada0370e7d72a591d58788f6db76bdbc3dddbb7)