Summary:
Briefly describe the changes made in this PR.

Issue Reference(s):
Fixes #3010 /claim #3010

Build & Testing:

• I ran cargo test successfully.
• I have run ./lint.sh --mode=fix to fix all linting issues raised by ./lint.sh --mode=check.

Checklist:

• I have added relevant unit & integration tests.
• I have updated the documentation accordingly.
• I have performed a self-review of my code.
• PR follows the naming convention of <type>(<optional scope>): <title>