Closes L2SDP-861
requested review from @kooistra
assigned to @walle
mentioned in commit e368ebeb
merged