SC-1238: Xuan's Links