Merge branch 'mm/credential-plumbing'