Closes L2SDP-959
requested review from @walle
assigned to @kooistra
mentioned in commit 4a55fb28
merged