Merge pull request #12601 from neheb/pam2