Merge pull request #9827 from ryanfox:patch-2