Closes L2SDP-786
requested review from @donker
assigned to @walle
mentioned in commit e0317675
merged