entity query.
Merge remote-tracking branch 'cnnic/dev'