Merge branch 'mh/password-can-be-pat'