Closes L2SDP-977
requested review from @walle
assigned to @kooistra
merged
mentioned in commit 1ef40bb9