Repo fixes part E
What does this MR do?
Fix review notes on !12198 (merged)
Are there points in the code the reviewer needs to double check?
Does this MR meet the acceptance criteria?
- Tests added for this feature/bug
- Has been reviewed by Frontend
- Conform by the merge request performance guides
- Conform by the style guides
- Squashed related commits together
What are the relevant issue numbers?