Closes L2SDP-1022
requested review from @walle
assigned to @kooistra
merged
mentioned in commit 5f4ea239