Merge pull request #3122 from akoeplinger/fix-41530