Query optimization on entities, and particularly the entity_list view.
Merge remote-tracking branch 'origin/develop' into develop