Merge pull request #24057 from BKPepe/gitignore