componentise facets

Merged Ken Hawkins requested to merge cherry-pick-6a5e84aa into master

(cherry picked from commit 6a5e84aa)

Merge request reports