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