Merge "BUG-113: Concentrate singleton instances into SingletonProviderContext"