Re-adding changes to GenDef to master
Pulling from upstream
Working on getting HaRe working again