merged in new sessionId changes
merged in new sessionId changes