MER-589: Surf's Links