Merge remote-tracking branch 'origin/master' into...
Merge remote-tracking branch 'origin/master' into 33-create-generator-infrastructur-based-on-templates
Merge remote-tracking branch 'origin/master' into 33-create-generator-infrastructur-based-on-templates