Merge branch 'dev' into feature/session-handoff