Merge pull request #1381 from schani/fix-23401