PRZ-1529: Marlow's Links