Merge branch 'patches/030_fix-if-else' into patches/040_pam-password-prompting