Merge "Change session ID string to ID object" into sc-dev