Imporoved config console.
Merge branch 'test' into dev