Changes for implementing ResolveExternalFieldReferencesHandler...