Merge "update the credentials in subscribe call"