Merge "Add content model indexing"