Merge "Add session ID" into sc-dev