Correct broken enumeration. !dm enumerations
Added tag 9.6.1 for changeset bd0fb2a7ca37