Merge "Update the session object with the error msg from ApexSessionInfo" into sc-dev