repo 1.12.23
Merge "Always output upstream if specified"