Logic dev

Dean Hoffmannrequested to merge
logic-dev into dev

Merge request reports