Merge pull request #1750 from garyhgohoos/23741