Merge pull request #1430 from lynnaloo/23299