Draft: Back ports for ticket zd371588 to 15.0.5

What does this MR do and why?

Cherry picks these two fixes onto 15.1.6 for a specific customer to backport them

• %15.7 - !106452 (merged)
• %15.9 - !111662 (merged)

The spec change from the %15.9 change didn't pick cleanly onto 15.1, left this out from this backport as well.

Screenshots or screen recordings

Screenshots are required for UI changes, and strongly recommended for all other merge requests.

How to set up and validate locally

Numbered steps to set up and validate the change are strongly suggested.

MR acceptance checklist

This checklist encourages us to confirm any changes have been analyzed to reduce risks in quality, performance, reliability, security, and maintainability.

• I have evaluated the MR acceptance checklist for this MR.