Merge pull request #2948 from ludovic-henry/coop-n2m-eh-callback