Merge "Partial config update: test update states"