Merge pull request #1690 from garyhgohoos/24194