5.4-dev
Merge remote-tracking branch 'upstream/4.4-dev' into 5/upmerge/0603
Merge branch '5.2-dev' into 5.3-dev-upmerge-2024-12-01