Merge branch 'dmlambea-optional-credentials'