refs #782 - enhanced enum field
Merge branch 'FB_782_ENUM_FIELD'