Merge branch "concept-index" into thin-client