Merge branch 'post-console-api'