Merge pull request #1648 from schani/sgen-independence