Merge in changes for configuration provider