fixes: issue #266 Override generation bug before a static function
Merge pull request #540 from SlavaRa/feature/issue266_Override_generation_bug_before_a_static_function

fixes: issue #266 Override generation bug before a static function
Merge branch 'develop' into feature/UnitTests