Merge pull request #2964 from ludovic-henry/sgen-monocontext