OData V4 Enums
Merge remote-tracking branch 'origin/master'