fixed lookup key for relation
Merge tag '2.3' into develop