Merge pull request #1710 from garyhgohoos/24230