Sessions changes [MJ-796]

All tests pass.