Merge "Introducing ConfigurationContainerListener"