Merge pull request #1893 from garyhgohoos/24662