Merge `main` into `feature/stable-cadence`

[jribbink]

We're having an issue with the emulator not working with latest flow-go. Emulator probably needs to be updated first