ROBE-139 Enum type parsers
Merge remote-tracking branch 'origin/master'