Merge pull request #21495 from colemanw/fieldsForJoin