Closes L2SDP-726
requested review from @kooistra
assigned to @walle
mentioned in commit 8d8fc2bd
merged
unassigned @walle