Merge pull request #12619 from mattwire/caseview_contactlink