Closes L2SDP-260
requested review from @walle
assigned to @kooistra
mentioned in commit 5f4c30ae
merged