7366fa2530
(cherry picked from commit f62c261900)
Co-authored-by: ying-jeanne <74549700+ying-jeanne@users.noreply.github.com>