More changes due to abstraction changes for the new resolver implementation. (FELIX-2036, FELIX-2037, FELIX-2035)