Merge pull request #1900 from garyhgohoos/24684