Correct upgrade_config behaviour for nested objects