 - [toolchain] Fix issues with generating generator string
 - [toolchain] Fix issues with generating generator string

hbirchtree/coffeecutie,hbirchtree/coffeecutie,hbirchtree/coffeecutie,hbirchtree/coffeecutie,hbirchtree/coffeecutie,hbirchtree/coffeecutie