Merging pull request 183 for #7793.