PHOENIX-933 Local index support to Phoenix. -Addendum2 (Rajesh)