Patch.5.3.1

[LaurentLesle]

Issue-id

PR Checklist

---

• I have updated the documentation accordingly.
• I have added tests to cover my changes.
• All new and existing tests passed.
• My code follows the code style of this project.
• I ran lint checks locally prior to submission.
• Have you checked to ensure there aren't other open Pull Requests for the same update/change?

Description

Does this introduce a breaking change

• YES
• NO

Testing