Merge pull request #1111 from dell/usr/saksham/25634-session-management