Merge "Clarify what's in the upstream- directories..." into main