Generic updates.
Merge branch 'config'