[merge] Various console changes

Console aims to be threadsafe now.