Concept page progress
Merged master
Merge branch 'master' into concept-page
some more indexes