Merge pull request #45035 from richard67/5.4-dev-upmerge-2025-02-28 [5.4] Upmerge changes from 5.3-dev 2025-02-28