Generic updates.
Merge branch 'config'
Generic fixes.
Merge branch 'config'