Merge pull request #7895 from Blue9/patch-1