Closes L2SDP-614
requested review from @donker
assigned to @kooistra
mentioned in commit ec777942
merged