Merge "Modify ConnectionServiceAdapter to include Session"