am d41806cb: Merge "Add ResolverController class"

* commit 'd41806cb55874d0eaf82fe11ffc62cf50a227313':
  Add ResolverController class