Merge pull request #1764 from garyhgohoos/24272