Closes L2SDP-822
requested review from @kooistra
assigned to @kooistra
mentioned in commit fc006bef
merged