Merge pull request #2982 from ludovic-henry/fix-cross-monocontext