Flush config changes.
Merge upstream changes.