Merge branch 'js/wincred-empty-cred' into maint