Closes L2SDP-1019
requested review from @walle
assigned to @kooistra
merged
mentioned in commit 69667ee7