Merge branch 'mm/api-credentials-doc'