Merge pull request #242169 from corngood/stone
authored by Artturi and committed by GitHub 2 years ago f810c296 362c9430