Model fix, generator fix
More config fixes
Merge remote-tracking branch 'upstream/master'