Merge "Add resolver to veridex." into pi-dev