Merge branch 'upload-credentials'