SC-1563: Whistle's Links