Merge branch 'lrn/attachconsole' into 'master'