Phoenix-933 Local index support to Phoenix (Rajesh)