Rebasing to ContentItem/ContentItemSet in facer.