Before submitting your PR, please review the following checklist:

- [ ] **Requirement** add a unit test.
- [ ] **Requirement** make sure all other tests pass.
- [ ] **Requirement** scan your code with SonarLint to ensure there are no findings
- [ ] **Please** making your changes small so they can be easily reviewed.
