EOX GitLab Instance

Backporting

Merged Fabian Schindler requested to merge master into staging

Backporting changes erroneously committed to master

Merge request reports