Merge pull request #13304 from mattwire/fixtargetcontactoncasecreate