Merge "Add ResolverController class"