bconsole and misc cleanup
Merge branch 'hotfix/1.2.0'