Closes L2SDP-1030
assigned to @donker
requested review from @donker
requested review from @kooistra and @walle
merged
mentioned in commit 33b5869a