Facet rearrange
Merge branch 'facet-rearrange' into build-29