Merge pull request #8060 from neheb/so