Merge "Fix encryption code in Session"