pull phaseOptimizer and BundleResourceFactory fixes