Merge branch 'generation'