Merge pull request #1714 from garyhgohoos/24224