Merge "Configuration updates:Making a clear distinction between Init and Change"