Closes L2SDP-1029
requested review from @kooistra and @walle
assigned to @donker
merged
mentioned in commit 559897a2