Merge branch 'config'
Generic updates.