Merge pull request #1664 from garyhgohoos/24144