Closes L2SDP-903
requested review from @walle
assigned to @kooistra
merged
mentioned in commit c17ad575