Merge pull request #1847 from garyhgohoos/24584