Resolvers extraction for 0.12

Cherry picked from feat-resolvers-0.13. Tests ARE NOT fixed