Merge pull request #1011 from shackbarth/21821