Closes L2SDP-832
requested review from @walle
assigned to @kooistra
mentioned in commit 9e2d3015
merged