Merge pull request #21084 from colemanw/fixGetInfoItem