Console message fixup
Merge branch 'component'