Merge branch 'session-id-in-new'