backport  pkill/issue-24-cred-passing