Production config

Merged Markus Scheidgen requested to merge production into master

Merge request reports