Closes L2SDP-531
requested review from @kooistra and @schuur
assigned to @walle
merged
mentioned in commit 5c6e4946
unassigned @walle