Merge branch 'console-workspaces' into dev