Merge "Use DB for checking Alternate IDs"