What does this PR do?

• Fixes #18710
• Fixes CAL-5043

/claim #18710

https://www.loom.com/share/c96e66ddbb8e4c449d3ee1a8bb348606?sid=5b333a67-a34c-4d9f-80e5-aad9ff544cfd

Mandatory Tasks (DO NOT REMOVE)

• I have self-reviewed the code (A decent size PR without self-review might be rejected).
• - N/A- 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.