Adding a counter for the filter values.
Merge branch 'refs/heads/master' into dev