Move generator instantiation logic to the base generator and fix a few typos
Merge branch 'release/0.7.0'