Closes L2SDP-837
requested review from @walle
assigned to @kooistra
mentioned in commit e6a478a5
merged