Ben Potter a5a7326415 chore: add cherry picks for v2.18.3 (#16187)
fixes #16182

<img width="1177" alt="Screenshot 2025-01-17 at 23 20 04"
src="https://github.com/user-attachments/assets/e0eec4bb-6b50-45e9-a27b-d3a89552562a"
/>
<img width="1163" alt="Screenshot 2025-01-17 at 23 20 12"
src="https://github.com/user-attachments/assets/d8a7129c-0240-4ef5-9f21-84cda5631366"
/>
<img width="1161" alt="Screenshot 2025-01-17 at 23 20 22"
src="https://github.com/user-attachments/assets/0ec78f3d-ec96-46a6-8def-aad4700712ac"
/>

(cherry picked from commit fbc2a73bef3110709e95f495a39fd9298871cdc8)

---------

Co-authored-by: Jaayden Halko <jaayden.halko@gmail.com>
2025-01-18 10:21:56 -06:00
..