fix: backport 8.0.3

[sattvikc]

Summary of change

(A few sentences about this PR)

Related issues

• Link to issue1 here
• Link to issue1 here

Checklist for important updates

• Changelog has been updated
• Changes to the version if needed
  • In build.gradle
• Had installed and ran the pre-commit hook
• Issue this PR against the latest non released version branch.
  • To know which one it is, run find the latest released tag (git tag) in the format vX.Y.Z, and then find the latest branch (git branch --all) whose X.Y is greater than the latest released tag.
  • If no such branch exists, then create one from the latest released branch.

Remaining TODOs for this PR

• Item1
• Item2