Closes L2SDP-713
requested review from @kooistra
assigned to @walle
merged
mentioned in commit 40ca2b9b