Merge pull request #11727 from blckmn/cherries