Closes L2SDP-880
requested review from @donker
assigned to @donker
mentioned in commit 0705e430
merged