Make granularity filter truly optional
Merge branch 'release/4.6'