Merge branch 'enum'