Merge "Improve ConfigurationImpl performance"