Move __resolveReference
resolvers on to extensions
#1746
Merged
__resolveReference
resolvers on to extensions
#1746