Merge branch 'jk/credential-cache-comment-exit' into maint