Closes L2SDP-819
requested review from @walle
assigned to @kooistra
mentioned in commit 380e5238
merged