Re #1152 Implement the custom facet feature.