Merged changes from upstream; adding more configuration for krb