9d6491be4f
(cherry picked from commit e13e6a7bd7)
Co-authored-by: ying-jeanne <74549700+ying-jeanne@users.noreply.github.com>