Merge pull request #1550 from lynnaloo/21048