Fixed non-existing references in field query
Merge remote-tracking branch 'origin' into release