Resolve STAT-314

Jan Oudmanrequested to merge
STAT-314 into master

Closes STAT-314. To be continued on L2SDP-88

Merge request reports