master to mvp

Morton, Alexrequested to merge
master into yolo_mvp

do it before we merge back

Merge request reports