Develop merge

Merged Marc Egger requested to merge develop into marcRenderDocumentationSphinx

Merge request reports