Closes L2SDP-564
requested review from @walle
assigned to @kooistra
mentioned in commit ace813a8
merged