Merge "enums in dimension attributes." into lmp-dev