Patch for issue 8920.
Merge pull request #1042 from ErunamoJAZZ/master

Patch for issue 8920.