6.1.0
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)
remove '' (#46381)
Merge remote-tracking branch 'jsst/6.0.4-release' into 6.1-dev