SC-2771: Matcha's Links