Closes L2SDP-958
requested review from @walle
assigned to @kooistra
mentioned in commit 09aeaf9d
merged