Update 2.x to 21

[derek-ho]

Description

[Describe what this change achieves]

Category

[Enhancement, New feature, Bug fix, Test fix, Refactoring, Maintenance, Documentation]

Why these changes are required?

What is the old behavior before changes and new behavior after changes?

Issues Resolved

[List any issues this PR will resolve (Is this a backport? If so, please add backport PR # and/or commits #)]

Testing

[Please provide details of testing done: unit testing, integration testing and manual testing]

Check List

• [ ] New functionality includes testing
• [ ] New functionality has been documented
• [ ] Commits are signed per the DCO using --signoff

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license. For more information on following Developer Certificate of Origin and signing off your commits, please check here.

[codecov[bot]]

Codecov Report

All modified and coverable lines are covered by tests :white_check_mark:

Project coverage is 70.36%. Comparing base (2641fc5) to head (3ca3102).

Additional details and impacted files

```diff @@ Coverage Diff @@ ## 2.x #2012 +/- ## ======================================= Coverage 70.36% 70.36% ======================================= Files 96 96 Lines 2541 2541 Branches 377 370 -7 ======================================= Hits 1788 1788 Misses 660 660 Partials 93 93 ```

:umbrella: View full report in Codecov by Sentry.
:loudspeaker: Have feedback on the report? Share it here.