Merge pull request #22955 from colemanw/schemaTrait