Code

Merge branch 'lt/in-core-index'