Merge pull request #1831 from garyhgohoos/24544