Merge pull request #1739 from garyhgohoos/23254-3