Dev#21436 dynamic facets

efalcy requested to merge dev#21436_dynamic_facets into WIP

Merge request reports