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