Fix object resolving
Merge branch 'feature/mef_dependencyresolver'