Merge branch 'pam-session'