Description of changes:
Cherry pick from develop into 1.20.x for the 1.20.1
Testing done:
Previous PRs for each change.
Terms of contribution:
By submitting this pull request, I agree that this contribution is dual-licensed under the terms of both the Apache License, version 2.0, and the MIT license.
Issue number: #4025
Closes #
Description of changes: Cherry pick from develop into 1.20.x for the 1.20.1
Testing done: Previous PRs for each change.
Terms of contribution:
By submitting this pull request, I agree that this contribution is dual-licensed under the terms of both the Apache License, version 2.0, and the MIT license.