Merge pull request #1692 from garyhgohoos/24154