Closes L2SDP-877
requested review from @kooistra
assigned to @kooistra
mentioned in commit fbfd2918
merged