Merge pull request #5002 from BrzVlad/feature-sgen-modes