Merge pull request #1654 from garyhgohoos/24111