Merge "Fix enum formatting for atoms: first value should be zero"