Merge "Break the repository index out separately from the test features"