Merge branch 'enum_type_fix' into 'ibm-trunk'

Enum type fix

See merge request !46