Merge "Fix broken LoaderLifecycleTest#loaderIdentityTest" into oc-dev