Merge "Remove no longer meaningful upstream: true flag." into main