Merge "Correct error in Configuration.updateFrom"