**As a part of this PR, release v2.3.0 is merged to main. This PR
contains the changes that were directly made into the release branch 2.2
and were updated to the release branch 2.3 when the release branch 2.2
was merged to 2.3**

Co-authored-by: Bidyashish <[email protected]>
Co-authored-by: Andrew Boni Signori <[email protected]>