IDE-1295.  Enum const must precede comma
Merge remote-tracking branch 'origin/spec' into spec