Allow continuing to existing session in demo
Merge branch 'master' into testing