chore(release): merge set of changes for v2.1.1

[anhuong]

Description of the change

Related issue number

How to verify the PR

Was the PR tested

• [ ] I have added >=1 unit test(s) for every new method I have added.
• [ ] I have ensured all unit tests pass

[github-actions[bot]]

Thanks for making a pull request! 😃 One of the maintainers will review and advise on the next steps.

[aluu317]

This LGTM, I see 2 PRs merged since the top of release branch from 2.1.0, matching the 2 Commits in this PR