Merged in mark-selected-facets by pduey.  No spec yet.