merge main and resolve conflicts #4139

Job	Run time
bridge-client-integration	0s
core-resource-signer	0s
build (ubuntu-22.04, x86_64, buildjet-8vcpu-ubuntu-2204)	10m 19s
governed-gas-pool	0s
build (macos-13-latest, arm64, macos-13-xlarge)	15m 50s
mcr	0s
movement-celestia-da-light-node	0s
movement-elsa-to-biarritz-rc1-bring-up	0s
movement-full-node-local	0s
movement-full-node-malicious	0s
movement-indexer-local	0s
movement-multi-node-local	0s
movement-full-node-remote	0s
move-modules-test	0s
solidity-bridge-tests	0s
unit-tests (ubuntu-22.04, x86_64, buildjet-8vcpu-ubuntu-2204)	3h 17m 24s
unit-tests (macos-13-latest, arm64, macos-13-xlarge)	3h 17m 55s
	7h 1m 28s

Provide feedback