Merge pull request #5524 from Andy2244/krb5-update