Improved session handling in the verification process
Merge remote branch 'origin/master'