Merge pull request #3137 from BrzVlad/fix-sgen-critical-region