Cherry-pick #2855

[aparajit-pratap]

Purpose

Cherry-pick #2855

Declarations

Check these if you believe they are true

• [ ] The code base is in a better state after this PR
• [ ] Is documented according to the standards
• [ ] The level of testing this PR includes is appropriate
• [ ] User facing strings, if any, are extracted into *.resx files
• [ ] Snapshot of UI changes, if any.

Reviewers

@wangyangshi

FYIs

(FILL ME IN, Optional) Names of anyone else you wish to be notified of

[wangyangshi]

add reviewer @ShengxiZhang

[aparajit-pratap]

@ShengxiZhang could you please review and merge these PRs? Thank you.