Closes L2SDP-760
requested review from @walle
assigned to @kooistra
mentioned in commit 966db9fb
merged