Merge branch 'enum-fix' into 'ibm-trunk'

Enum fix

See merge request !63