JFG-589 (FIX Generation type)
Merge pull request #386 from marknovozhilov/JFG-612

JFG-589 (FIX Generation type)