Merge pull request #1150 from ludovic-henry/pr17c-delegate-trampoline