fix: cherry picking commits for integration branch

[sandeep6189]

Pull Request checklist

• [x] The commit(s) message(s) follows the contribution guidelines ?
• [x] Tests for the changes have been added (for bug fixes / features) ?
• [x] Docs have been added / updated (for bug fixes / features) ?

fix: cherry picking commits for integration branch