Merge pull request #1816 from grandpaul/paulliu-warp7-multiconsoleapi