Integration/linked

Sebastian Schüpbachrequested to merge
ema-om:integration/linked into integration/linked

Created by: ema-om

Merged changes from last week and resolved all conflicts to these changes

Merge request reports