Dict lookup

Merged Mark OLESEN requested to merge dict-lookup into develop

Merge request reports