Merge pull request #2593 from ludovic-henry/coop-fix-native-to-managed