Work/enums

Nicolas Fellarequested to merge
work/enums into master

Some preparation for !381 (merged)

See commit messages

Edited by Nicolas Fella

Merge request reports