New way of session handling

Change-Id: I3246fa50d2dac9a65f26045bcb9386660b602aa4
Merge "New way of session handling"