Merge pull request #1732 from garyhgohoos/24224-2