Merge branch 'hotfix/rack-zippy'
fix bug where enum was being defined twice
Merge branch 'hotfix/call_enum_definition' into stage