NEB-3927: Riku's Links