Merge "Backfill new field host_commong_data" into main