Fixed getNormalizedIdentifier
Fixed OneToMany case
Merge remote-tracking branch 'upstream/fix-one-to-many-match'