[MP] Plausible fix from q3mme/ent for avi record sync issues.