Closes L2SDP-1035
requested review from @walle
assigned to @kooistra
mentioned in commit 8707d817
merged