chore: Accumulated backports to v4#21694

ludamad merged 2 commits intov4AztecProtocol/aztec-packages:v4from

backport-to-v4-stagingAztecProtocol/aztec-packages:backport-to-v4-stagingCopy head branch name to clipboard