Cherrypicks 3.4

[reddyashish]

Purpose

Cherrypicking minor changes:
#15615 and #15614

Declarations

Check these if you believe they are true

• The codebase 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
• All tests pass using the self-service CI.
• Snapshot of UI changes, if any.
• Changes to the API follow Semantic Versioning and are documented in the API Changes document.
• This PR modifies some build requirements and the readme is updated
• This PR contains no files larger than 50 MB

Release Notes

Cherrypicks 3.4

Reviewers

@QilongTang

[github-actions]

UI Smoke Tests

Test: success. 11 passed, 0 failed.
TestComplete Test Result
Workflow Run: UI Smoke Tests
Check: UI Smoke Tests

[QilongTang]

FYI: @twastvedt Cherry-picking important bug fixes already on master branch.