Merge pull request #1899 from garyhgohoos/24653