Add support for enums
Remove diagnostic block
Merge from master