Fix problem of trying to process null cookie
Fix decryption exception if identity changed
Merge remote-tracking branch 'upstream/master'