Apply code changes from MR 157026

What does this MR do and why?

Recreate !157026 (merged) in a new branch with the latest 17-0-stable-ee to test if this branch have a passing danger-review local

MR acceptance checklist

Please evaluate this MR against the MR acceptance checklist. It helps you analyze changes to reduce risks in quality, performance, reliability, security, and maintainability.

Screenshots or screen recordings

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

Before	After

How to set up and validate locally

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