Cleanup of the console.
Merge branch 'test' into dev
Some console cleanup.
Merge branch 'test' into dev