Merge pull request #3006 from arik-so/arik/trampoline/2024-04-trampoline-onion-deseri...