Integration nr 2019 w21

Merged Florian Kaltenberger requested to merge integration-nr-2019-w21 into develop-nr

Merge request reports