Closes L2SDP-538
requested review from @schuur
assigned to @kooistra
mentioned in commit d20463f1
merged