Merge branch 'feature/session-demo' into develop