6.1.2
Merge remote-tracking branch 'upstream/5.3-dev' into 5.4-upmerge-2025-04-22
[6.0] Change major version to 7.0 for deprecation removals (#46367)
Merge branch '5.4-dev' into 6.1/upmerge/260605