1db431b5cf
(cherry picked from commit b512a3d75f)
Co-authored-by: ying-jeanne <74549700+ying-jeanne@users.noreply.github.com>