fix session driver
Merge origin/master