Merge "ahat: ignore duplicate instances with the same id"