Merge branch 'logic-dev' into 'dev'

Dean Hoffmannrequested to merge
dev into logic-dev

did some more setup

See merge request !3 (merged)

Merge request reports