HOTFIX: null values in facet entries
Merge branch 'release/4.1'