chore: sync with hotfix v20

[eshankvaish]

Description

chore: sync with hotfix v20

Type of change

• Bug fix (non-breaking change which fixes an issue)
• New feature (non-breaking change which adds functionality)
• Breaking change (fix or feature that would cause existing functionality to not work as expected)
• This change requires a documentation update

How Has This Been Tested?

Please describe the tests that you ran to verify your changes. Provide instructions so we can reproduce. Please also list any relevant details for your test configuration

• Test A
• Test B

Checklist

• The title of the PR states what changed and the related issues number (used for the release note).
• Does this PR require documentation updates?
• I've updated documentation as required by this PR.
• I have performed a self-review of my own code
• I have commented my code, particularly in hard-to-understand areas