Closes L2SDP-755
requested review from @walle
assigned to @kooistra
mentioned in commit 177f1d20
merged