PLA-1305 session switching implementation
Merge remote-tracking branch 'origin/master'