Merge pull request #1784 from garyhgohoos/23593-2