Handle multiple matches on lookup - compare the primary key and object type.
Merge branch 'master' into orgchange