Merge pull request #3705 from BrzVlad/fix-sgen-internal-alloc