Feature/speed up generation#34

curt-tigges merged 2 commits intomaincurt-tigges/crosslayer-coding:mainfrom

feature/speed-up-generationcurt-tigges/crosslayer-coding:feature/speed-up-generationCopy head branch name to clipboard