Merge pull request #2702 from akoeplinger/bug-38933