What does this PR do?

• Fixes #18658
• Fixes CAL-5024

/claim #18658

https://github.com/user-attachments/assets/d3fac7ef-9bfd-452f-931c-231995f40189

Mandatory Tasks (DO NOT REMOVE)

• I have self-reviewed the code (A decent size PR without self-review might be rejected).
• I have updated the developer docs in /docs if this PR makes changes that would require a documentation change. If N/A, write N/A here and check the checkbox.
• I confirm automated tests are in place that prove my fix is effective or that my feature works.