Merge "Track default upstream when system is ready"