Merge "In case of an error event, cleanup the config too"