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