index refinement
Merge commit 'd943eaf3ca2f5c78aeacbdaf3eac20c500a49291'