Merge pull request #960 from lynnaloo/21587