Remove todo comment.
Add multi-session test.
Merge remote-tracking branch 'origin/master'