NEB-1652: Sapnap's Links