Merge "Remove zone_id on import compare"