merge in changes for configuration provider