Always attempt to lookup index imports from current directory before existing paths
Merge branch 'pr/1057' into rc-0.33