Daravind/resolver job local catalog

Daravind/resolver job local catalog