#DDC-1590: Fix Inheritance in Code-Generation
#DDC-1590: Fix Inheritance in Code-Generation: Code Style Fixes
#DDC-1590: Simple Fixes
Simple Fixes
Merge pull request #1098 from encoder32/DDC-1590

#DDC-1590: Fix Inheritance in Code-Generation