Merge pull request #3018 from ludovic-henry/coop-marshal-attach