Merge branch 'patches/040_pam-password-prompting' into patches/050_ck_patch