Core console 1.5.x

Clone of pull request #22 based on branch 1.1.x