Merge pull request #1874 from krauseo/issue24592