Move previous change to branch 3rd_party_creds