M-2371: avi's Links