Part 1: 2301239 Follow up issue for Link field