Merge pull request #1742 from garyhgohoos/23254-3