What does this PR do?
- Fixes #18710
- Fixes CAL-5043
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. N/A.
- I confirm automated tests are in place that prove my fix is effective or that my feature works.
Next issue in about 19 hours