Merge "Refactor duplicate isolated creds code"