Merge pull request #14349 from mattwire/case_links_refactor_3