Merge pull request #1837 from garyhgohoos/24224-3