Merge pull request #8917 from bcomnes/patch-1