Merge "Setup versionless identity endpoint in catalog"