Merge "Sync grains before hosts update"