Merge "Pass identity_version into get_credentials"