Closes L2SDP-850
requested review from @kooistra
assigned to @walle
mentioned in commit a2eaacec
merged
unassigned @walle