Merge pull request #1120 from jrogelstad/22143