Merge of hierarchical facet changes into the 2.10.x-imos branch