pulls in changes from IntersectPosition PullRequest on master
Index refactoring