New index branch

Can you merge this branch?