Closes L2SDP-592
requested review from @kooistra
assigned to @donker
merged
mentioned in commit 282867ae