Merge pull request #891 from shackbarth/20906