NEB-1696: Pastry's Links