Changed: minor improvements to SetupFactory/Legacy
Merge pull request #367 from patrickallaert/SetupFactory-Legacy-improvements

Changed: minor improvements to SetupFactory/Legacy