Merge pull request #2538 from ludovic-henry/fix-sgen-38012