Added default resolvers.
Merge branch 'test' into dev