Patch to add cred store support