Merge branch 'mh/credential-leakfix' into maint