Closes L2SDP-878
requested review from @walle
assigned to @kooistra
mentioned in commit 75615d5f
merged