GitLab

Merge branch 'develop' into svn: fixing Scan-1 test. Interestingly this has nothing to do with any of the changes of yesterday, still the test was broken today but not before