Minor gen improvement, test code
Merge remote-tracking branch 'repo/master'