Merge branch 'add-test-update_credentials' into 'develop'