Added some missing features to the session.
Merge remote-tracking branch 'origin/master'