Closes L2SDP-870
requested review from @kooistra
assigned to @walle
merged
mentioned in commit b34bfd43