Update query provider to cache "count" value.
Merge remote-tracking branch 'origin/develop' into develop